From b65957655a7f8d59e3a1e77d37c45888e29c4f96 Mon Sep 17 00:00:00 2001
From: "bren@br260.wolfson.cam.ac.uk" <bren@br260.wolfson.cam.ac.uk>
Date: Mon, 11 Apr 2005 15:24:58 +0000
Subject: [PATCH] bitkeeper revision 1.1286 (425a96ca5UAvnSzOyOKUFxfHjMVm9g)

Define atomic functions ourselves rather than relying on
kernel headers under "/usr/include".

Signed-off-by: bin.ren@cl.cam.ac.uk
---
 tools/xentrace/xentrace.c  | 8 ++++++--
 xen/include/public/trace.h | 2 --
 xen/include/xen/trace.h    | 3 +--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index dc3cd141bb..50988c90f8 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -22,6 +22,10 @@
 #include <signal.h>
 
 #include "xc_private.h"
+
+typedef struct { int counter; } atomic_t;
+#define _atomic_read(v)		((v).counter)
+
 #include <xen/trace.h>
 
 extern FILE *stderr;
@@ -242,7 +246,7 @@ unsigned long *init_tail_idxs(struct t_buf **bufs, unsigned int num)
     }
     
     for ( i = 0; i<num; i++ )
-        tails[i] = atomic_read(&bufs[i]->rec_idx);
+        tails[i] = _atomic_read(bufs[i]->rec_idx);
 
     return tails;
 }
@@ -310,7 +314,7 @@ int monitor_tbufs(FILE *logfile)
     while ( !interrupted )
     {
         for ( i = 0; ( i < num ) && !interrupted; i++ )
-            while( cons[i] != atomic_read(&meta[i]->rec_idx) )
+            while( cons[i] != _atomic_read(meta[i]->rec_idx) )
             {
                 write_rec(i, data[i] + cons[i], logfile);
                 cons[i] = (cons[i] + 1) % size_in_recs;
diff --git a/xen/include/public/trace.h b/xen/include/public/trace.h
index ed5127db65..1b15314cce 100644
--- a/xen/include/public/trace.h
+++ b/xen/include/public/trace.h
@@ -8,8 +8,6 @@
 #ifndef __XEN_PUBLIC_TRACE_H__
 #define __XEN_PUBLIC_TRACE_H__
 
-#include <asm/atomic.h>
-
 /* Trace classes */
 #define TRC_GEN     0x00010000    /* General trace            */
 #define TRC_SCHED   0x00020000    /* Xen Scheduler trace      */
diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h
index e46d916c32..68b51cbfb7 100644
--- a/xen/include/xen/trace.h
+++ b/xen/include/xen/trace.h
@@ -23,8 +23,6 @@
 #ifndef __XEN_TRACE_H__
 #define __XEN_TRACE_H__
 
-#include <public/trace.h>
-
 #ifdef TRACE_BUFFER
 
 #include <asm/page.h>
@@ -34,6 +32,7 @@
 #include <asm/current.h>
 #include <asm/msr.h>
 #include <public/dom0_ops.h>
+#include <public/trace.h>
 
 extern struct t_buf *t_bufs[];
 extern int tb_init_done;
-- 
2.30.2